Merge changes made in Gnus trunk.
authorGnus developers <ding@gnus.org>
Tue, 29 Mar 2011 13:23:38 +0000 (13:23 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 29 Mar 2011 13:23:38 +0000 (13:23 +0000)
commit0870781001ca981c4f5eb69d3c9aa02f3e9b5064
treefd172dd3d8eff48a719157c119cb995ad57e319c
parent4e47e1899a000d73f407c33c45c8184947348668
Merge changes made in Gnus trunk.

mm-view.el (mm-display-inline-fontify): Use `set-normal-mode' with local variables disabled rather than `normal-mode'.
imap.el (imap-shell-open, imap-process-connection-type): Use imap-process-connection-type for 'shell' streams as well as Kerberos, SSL, other subprocesses.
lisp/ChangeLog
lisp/gnus/ChangeLog
lisp/gnus/mm-view.el
lisp/net/imap.el